d/p/support_x32: Slightly broaden VDB allow-list (#1117023)

... in configure(.ac).

diff --git a/debian/changelog b/debian/changelog
index c8f66fef729ced22d672e1887a0645943439b432..b46b8cf956c8eba1e68d6efd6cad04265ececc4e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,12 +2,14 @@ ncbi-blast+ (2.17.0+ds-3) UNRELEASED; urgency=medium
 
   * NOT RELEASED YET.
   * debian/control: Restrict armv8crc-support dependency to arm64.
+  * debian/patches/support_x32: Slightly broaden configure(.ac)'s VDB
+    allow-list.  (Closes: #1117023.)
   * debian/patches/zcf-simde-crc32c: Leave CFLAGS alone on 32-bit ARM;
     adjustments aren't actually worthwhile there and would have needed to
     go further on armhf, on which (at least under GCC) ARMv8 targets
     additionally need +simd.  (Closes: #1117022.)
 
- -- Aaron M. Ucko <ucko@debian.org>  Thu, 16 Oct 2025 16:10:17 -0400
+ -- Aaron M. Ucko <ucko@debian.org>  Thu, 16 Oct 2025 16:13:34 -0400
 
 ncbi-blast+ (2.17.0+ds-2) unstable; urgency=medium
 

diff --git a/debian/patches/support_x32 b/debian/patches/support_x32
index 7e166d8cd9e5bd8bf669081751a997768ae7aed4..a0154db5f2e2674aeb83a42311e07ade489f2a55 100644 (file)
--- a/debian/patches/support_x32
+++ b/debian/patches/support_x32
@@ -14,3 +14,25 @@ Avoid picking up wrong inline assembly.
  #    define NCBI_COUNTER_64_BIT
  #  endif
  #  ifdef NCBI_COUNTER_64_BIT
+--- a/c++/src/build-system/configure
++++ b/c++/src/build-system/configure
+@@ -28265,7 +28265,7 @@ $as_echo "$as_me: WARNING: $message" >&2
+             darwin*:*86*:64 ) vdb_libpath=mac/$vdb_mode/x86_64/lib   ;;
+             darwin*:*86*:* )  vdb_libpath=mac/$vdb_mode/fat86/lib    ;;
+             darwin*:arm*   )  vdb_libpath=mac/$vdb_mode/arm64/lib    ;;
+-            linux*:*86*:64 )  vdb_libpath=linux/$vdb_mode/x86_64/lib ;;
++            linux*:*86*64  )  vdb_libpath=linux/$vdb_mode/x86_64/lib ;;
+             linux*:aarch64* ) vdb_libpath=linux/$vdb_mode/arm64/lib  ;;
+             * )
+                if test -n "$with_vdb"; then
+--- a/c++/src/build-system/configure.ac
++++ b/c++/src/build-system/configure.ac
+@@ -7837,7 +7837,7 @@ if test "$with_vdb" != "no" ; then
+             darwin*:*86*:64 ) vdb_libpath=mac/$vdb_mode/x86_64/lib   ;;
+             darwin*:*86*:* )  vdb_libpath=mac/$vdb_mode/fat86/lib    ;;
+             darwin*:arm*   )  vdb_libpath=mac/$vdb_mode/arm64/lib    ;;
+-            linux*:*86*:64 )  vdb_libpath=linux/$vdb_mode/x86_64/lib ;;
++            linux*:*86*64  )  vdb_libpath=linux/$vdb_mode/x86_64/lib ;;
+             linux*:aarch64* ) vdb_libpath=linux/$vdb_mode/arm64/lib  ;;
+             * )
+                if test -n "$with_vdb"; then